Skip to content

PSES side changes for issue #96 - support x86/x64 debugging. #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

rkeithhill
Copy link
Contributor

Besides all the awesome work @adamdriscoll did to enable this; there are some changes that need to be made to package.json in the vscode repo. In order to support those changes, we need a different filename for the x86 batch file that launches the x86 debug host.

Besides **all** the awesome work @adamdriscoll did to enable this; there are some changes that need to be made to package.json in the vscode repo.  In order to support those changes, we need a different filename for the x86 batch file that launches the x86 debug host.
@rkeithhill
Copy link
Contributor Author

@daviwil - is there somewhere this renamed file needs to be added to ensure it is part of the package and installed into the extension's bin dir? Presumably the x86 host exe has already been added to the extension package (and bin dir)?

@rkeithhill
Copy link
Contributor Author

I'm not sure the VSCode tweak is going to make it into the next release. I'm going to hold off on the vscode-powershell change until I can verify the VSCode fix is in place. But I think this PR is still good to merge (shouldn't hurt anything even if it isn't being used yet).

@daviwil
Copy link
Contributor

daviwil commented Feb 2, 2016

Yeah, I was thinking about the packaging issue recently... I think it makes sense for there to be a single PowerShellEditorServices.Host NuGet package which contains both host EXEs and respective cmd files. Right now I think the only way to accomplish that will be to change the src\PowerShellEditorServices.Host\PowerShellEditorServices.Host.nuspec file to include all of the necessary files so that they're packaged up together.

I believe this requires adding a files section under the root package node after metadata:

<files>
  <file src="bin\$configuration$\$id$.exe" target="lib\net45\" />
  <file src="bin\$configuration$\$id$.DebugAdapter.cmd" target="content\" />
  <file src="..\PowerShellEditorServices.Host.x86\bin\$configuration$\$id$.x86.exe" target="lib\net45\" />
  <file src="..\PowerShellEditorServices.Host.x86\bin\$configuration$\$id$.DebugAdapter.x86.cmd" target="content\" />
</files>

More info: http://docs.nuget.org/Create/Nuspec-Reference

You should be able to test this by running this command (note the .csproj at the end):

.\.nuget\NuGet.exe pack src\PowerShellEditorServices.Host\PowerShellEditorServices.Host.csproj

I actually just tried to replicate this and it worked fine for me. Both DLLs and CMD files show up in the resulting NuGet package for me. If you make this change, could you also delete the .nuspec file in src\PowerShellEditorServices.Host.x86 so we don't end up with an extra NuGet package?

@rkeithhill
Copy link
Contributor Author

Is this NuGet package what gets pushed to the VSCode gallery as the PSES extension?

@daviwil
Copy link
Contributor

daviwil commented Feb 2, 2016

Nah, it's one step earlier in the chain where I publish NuGet packages of the binaries to NuGet.org. I'm going to start using Install-Package to yank those from NuGet to package up the VS Code extension.

@rkeithhill
Copy link
Contributor Author

OK, I'll commit to this branch so it is all contained. Might not get to this until tomorrow.

@daviwil
Copy link
Contributor

daviwil commented Feb 3, 2016

No problem, thanks a lot for doing it!

… host exe/batch files.

The nuspec includes both native (x64) and x86 versions of the exe and batch files.  Removed the nuspec file from the Host.x86 dir per @daviwil request.
@rkeithhill
Copy link
Contributor Author

Man, that Platform=X64 environment variable bit me again. Nuget.exe failed until I removed that env var from my console. Anyway, the update to this PR for the requested nuspec changes have been pushed.

@daviwil
Copy link
Contributor

daviwil commented Feb 3, 2016

Awesome, thanks for making the nuspec changes! Merged.

daviwil added a commit that referenced this pull request Feb 3, 2016
…4-dbg

PSES side changes for issue #96 - support x86/x64 debugging.
@daviwil daviwil merged commit 21c3025 into PowerShell:master Feb 3, 2016
@rkeithhill rkeithhill deleted the rkeithhill/is96-support-x86x64-dbg branch February 3, 2016 16:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants